Right, this was a hack - I didn't want to spend too much time on it, because I thought I heard discussion about moving the module common stuff to the container context, which would eliminate this part of the issue.