Make module and library definers more conforming to the DRM