Convert first CmdLocation loop to iterate with pointers.  Add missing
failed compile cleanup discovered in the conversion.