CompoundParser support: bugfixes + code cleanup

Small fix in the CompoundParser code