Fixes issue #227.

It was only collecting subclauses for component classifiers.
Now does it for classifiers (including feature group types).