As soon as you merge in the 4 fat PRs fixing moduleclasses, 
I will supply to you another PR fixing *any* SOURCE*TAR_GZ opportunity across the whole codebase.
Let's agree to do this during the code freeze period because it really minimizes work for everybody.