Commit before refactoring base class.