Remove maybePrefixMatch, using stripPrefix instead