more finishParsingModuleDeclaration refactoring