Clean up f3be0f40b7c5072635b2d6dab772f2c29e8d629a a little.