Merged minor cleanups from 3.2.