Some constant refactorings.