Kinder, simpler dehopification + faster optimization pass

No longer pukes on three policies in sequence...