Some tidyups of the Include refactoring