Minor refactors.