In theory if we do #343 and #342 we can start replacing the bespoke matchers with grammar based ones.