Created attachment 747343 [details] [diff] [review]
I found a member variable that wasn't being used, plus some unnecessary includes that we no longer need - attaching patch (passed on try on windows).
Looks like Mark already landed this.
Yep. aceman: thanks for setting checkin-needed, but I usually land my own patches (as I have access, it saves someone else the work) and not setting it avoids potential checkin conflicts - however, if after a week or so I've obviously forgotten, please do poke me.