Handle do/match better.