Move --dump processing completely outside of loop.