Thanks. I've applied this after splitting the cleanup into a second patch and rewriting the commit log to describe the changes a bit better. In the future please try to split fixes and cleanups, or generally separate changes yourself.