Cleanups for #377