More powerful utility quad drawing. Also some cleanups.