Final cleanup to complete all rules in Clause 12.
Reinserted all imports.
Added names from R1200...