> "-- # <whatever> QUERY\n%s\n\n"
Attached an attempt along those lines. I found another duplicate of the ascii-art printing in another function.
Completion queries seems to be out of the echo/echo hidden feature.
Incredible, there is a (small) impact on regression tests for the \gexec case. All other changes have no impact, because they are not tested:-(