Cleanup/syntax type match

Arguably a somewhat risky change, so please review