Slight change/simplification to the interface used by ControlFactory.cpp
Added back some code that accidentally got removed from a bad merge on a previous commit.
Merge pull request #1254 from sgrenier/next

Slight change/simplification to the interface used by ControlFactory