Minor refactoring and potentially fixing growth.