Fixed naming and gathering of subforms.
Added fix for arbitrary class options on CCL.