More fallout from refactoring