Break up some syntax rules to prevent cylic imports, which cause the build to loop forever in ESV packing.