+ CQueryWith*Node optimizations (actually previous check-in)
+ next: begin cleanup of debug code
Authored by: mukau 2018-11-30
Parent: [r1129]
Child: [r1131]