Ensure do can be at the start of its own line, closes #2053