- simplify code
More opportunities to improve query-caching.