Added more robust ControlParameter detection.
a