cryptohazemultiforcer: Clean up a bit more.
Merge in 'cryptohazemultiforcer'.