(cleanup) Less nested modules
(cleanup) Remove unnecessary 'workaround'
Merge pull request #9 from cmr/master

(cleanup) Minor cleanups.