Move catalog defaults to catalog_query.h.

Also move WQ specific defines to WQ.