Need to find and fix generator bugs: Multiple xcontrols no longer create. Folding individual controls no longer works.