Merge pull request #2557 from WalterBright/no-semantic0

refactor: remove semantic0 hack