Refactor “expand_new_type”.