Avoid requiring match is certain circumstances

Closes #115