Minor refactor work.