Small refactoring changes again (again).