More optimization poking