Consolidate references to "devcpu.debugmodel"; Minor cleanup