Please submit separate patches for unrelated issues. As a whole, the
patch is unacceptable because of that.

Please don't add comments to the code that describe what has changed, or
what was before. Only describe what is. Specifically, don't say
"renamed:...".

Also, for each issue, it would be good if you could provide a short test
case that demonstrates the bug that gets fixed with the patch.