(cleanup) Less nested modules
(cleanup) Remove unnecessary 'workaround'