minor cleanup for 3.14

J. Bruce Fields
2014-01-07T21:05:12Z

These are just some minor bits of cleanup I'm queueing for 3.14.

--b.