Changes to code structure after running through the local Code Checker plugin.