Meh, I won't change code that I didn't write here. Feel free to send followup PRs.