I'm about to add another case, so it makes sense to split this out to make the semantic changes in the next change more obvious.