Minor refactor.  Nothing to see here.