fix parsing errors defining types with subtype syntax
fix parsing for __ in __ regression