A few improvements

Hi @willmorgan, here are a few improvements I've made.

Sorry they are all bunched up - I consider them fairly minor, and they are all backwards compatible.

Happy to split up into separate pull requests, if needed.
Better to include it. If framework removes the installers dependency then the functionality will break, and there's no harm in including it now anyway