Some minor cleanup changes in addition to the previous check-in