Merge pull request #171 from dreid/use-currentmodule

Make use of currentmodule to maybe reduce redundant module definitions a...