Created by: rvantonder
Just doing some query cleanups. Don't want us to use Fields(), it assumes a flat query.
Fields()
Semantics-preserving.