Hello!
Now that you have modules (by the way, what is the definition taken of a module? A changeset with prerequisite?), I was wondering why not to include the responsability of source management in the module itself rather than in the method?
In that case, the 4 bytes trail would be avoided....
Alexandre