Migration away from a declared DartModuleType and minor word-smithing.