Remove code duplication

I was trying to understand this logic with an eye to some changes Alison was asking about, and we have some logic repetition here. Applying some DRY.