Slight change/simplification to the interface used by ControlFactory