CI-25
generalize how we do 'module to dict'

+review SYS-69