restructured to allow peephole optimization of IncSP