Cleanups for #1657