Misc checkin-changes.