Use cursor-right movement rather than spaces for left-margin.
Don't do the clear-to-EOL thing added in previous commit.