Refactor Multiline Arg factory a bit
Fix broken wire protocol steps
Push special case out of factory back to where it's used