CompoundParser support: bugfixes + code cleanup

Needs to be tested...