Missed out change from "variable cleanup". (Currently) not used in simulation, anyway, as control here is hard-wired ...