Changes to comply with constant refactorings.