Even more multiline command fixes.