Fixed failure with compound type declarations.

This is essentially the same bug as #3