Add optimizations from Hundsbuah