cleanups

Remove WITH-DATABASE macro.
QUERY now accepts a database argument. T is a synonym for
*default-database*.