Clean up logic of Return to not accumulate newlines on ctl-Return