Clean up imports in a couple of classes

This cleanup also avoids compile errors due to a recent refactoring of
DefaultModuleItem (which was imported, but not needed, by these to
classes).