Clean up hard-coded module factory and refactor module creation logic.

[dcwhite]

This is a continuation of issue #54.

[dcwhite]

Intertwined with #64.

[dcwhite]

This is definitely creating lots of painful merges. We should switch to dynamically-generated factory soon.