incompleteTypeMap refactoring