Improved return type of PathMatcher.getMatch