Rewrite user-query sugar to use macros

Now we can macroexpand (j-> ...) etc. to see what it would look like.