Small refactoring changes again.