Refine define-query

No longer needs to hack Postmodern prepare internals.
Revise the syntactic sugar for JSON queries

Much better now for use in join.