Small cleanup before branching to experimental for module API