Yet more refactoring for 2.0