Bulk commit of dusty, long-forgotten and hopefully self-documenting changes.  They should be fairly minor.  Forgive me, development Gods, for I have sinned...