Remove dependency on regexp lib, use custom matchers instead