Apply cleanups from 675e049ceeb0da9