More gunstore optimizations