Some more refactoring changes.