Restored "optimization" lost while testing and comparing implementations.