Rework module shenannigans.