Fix up some loose ends from the last big check-in.
5 files changed