Eliminate some awful in/out arguments
Make modifying multiple lines at once less brittle

Only count characters outside of override blocks for the relative
positions to do the edits on each line, which handles the case where the
lines have different lengths of stuff in override blocks but the same
text.