Package cleanup

Needed them in the past for old packaging that wouldn't install without at least one control for the module definition.