Make module and library definers more conforming to the DRM
Merge pull request #37 from fracek/module-library-def

Make module and library definers more conforming to the DRM
Reinstate hack for the macro hack.