Fix one place where parameterized module names were not handled correctly.
(And cleanup patch in cp_opt.P to make testing of internal variables more precise.)
Authored by: dwarren 2017-01-07
Parent: [r8957]
Child: [r8959]