Tweaks to user control generator.