More work on making modules completely visible via state object.