Ported over the low-hanging fruit from the unparsing test monster. Refs #23.

Also, AppCode decided to change that thing back. Stop fighting!