Makes map proxy support more check-style compliant

- Although BasicMapContextQuerySupport still needs some more refactoring, query methods should be more comprehensive/readable now.