I intend to add regression tests for these cases to the parser as a follow-up PR. Fixes #490 Fixes #494