[NF] Minor refactoring.