Refactor the core gently.