Instead of returning an SObject as a result, Query should also support returning a map, which automatically resolves namespace.