iris: move some non-buffer case code in a bit