Meta: next time we do a patch with renames and changes, let's try and keep the renames in separate commits at least through the rebase stage so git sees the rename and I get my diff hunks for review purposes. :)