cosmetics
reduced module extraction to a single pattern match in the normal case