Syntax of writing shallow queries cleaned up.