Clean location.matches

The match pattern was causing trouble... a direct check rather than
regex is a lot simpler and more reliable.