Continued refactoring of CodeUnit
Switch some uses of old command line syntax to new