More minor cleanup before merge.