not sure how hard it is to modify pull requests, but could we do a version of this without the tabbing being changed?  it makes it harder to see what parts of the file were actually changed.