I was going to submiit a patch, but it was practically all just Organise Imports, and a custom set of build errors/warnings for the root model plugin.