Fixed quick refactoring oversights.