I've been toying around (in my head) with the idea of using a diff algorithm to align things like this.