Minor refac.