Fix PR 3471, and some cleanups.