Minor cleanup of UnitControl