Small cleanups for #902