More oopses from refactoring