2014-10-13 sl Cleaning up control creation code.