Mopping up straggler fields.  Closes (almost) #132.