* src/disamb/declarator/ValidDeclarator.str,
	* src/disamb/declarator/ParameterDeclaratorCandidate.str,
	* src/disamb/declarator/ParameterDeclarator.str,
	* src/disamb/declarator/MemberDeclaratorCandidate.str,
	* src/disamb/declarator/MemberDeclarator.str,
	* src/disamb/declarator/Makefile.am,
	* src/disamb/declarator/afcxx-declarator.str,
	* src/disamb/declarator/InitializerDeclaratorCandidate.str,
	* src/disamb/declarator/InitializerDeclarator.str,
	* src/disamb/declarator/IfDebug.str,
	* src/disamb/declarator/FunctionDeclarator.str,
	* src/disamb/declarator/Declarator.str,
	* src/disamb/declarator/ValidDeclarator.meta,
	* src/disamb/declarator/ParameterDeclaratorCandidate.meta,
	* src/disamb/declarator/ParameterDeclarator.meta,
	* src/disamb/declarator/MemberDeclaratorCandidate.meta,
	* src/disamb/declarator/InitializerDeclaratorCandidate.meta,
	* src/disamb/declarator/MemberDeclarator.meta,
	* src/disamb/declarator/InitializerDeclarator.meta,
	* src/disamb/declarator/FunctionDeclarator.meta,
	* src/disamb/declarator/Declarator.meta:
	Delete. It needed context to know (class names) to accept constructors.

	* configure.ac, src/disamb/Makefile.am,
	* src/parser/parse-cxx.str, config/check-rules.mk: Update.

	* src/disamb/disambiguate/Lookup.str:
	Delete deprecated imports.

	* src/disamb/disambiguate/TypeDefinition.str,
	* src/disamb/disambiguate/TemplateDefinition.str,
	* src/disamb/disambiguate/TemplateClassDefinition.str,
	* src/disamb/disambiguate/ResolveCompound.str,
	* src/disamb/disambiguate/Resolve.str,
	* src/disamb/disambiguate/NamespaceDefinition.str,
	* src/disamb/disambiguate/Makefile.am,
	* src/disamb/disambiguate/Definition.str,
	* src/disamb/disambiguate/ClassDefinition.str,
	* src/disamb/disambiguate/TemplateFunctionDefinition.str:
	Do the former job of afcxx-declarator.

	* src/disamb/disambiguate/SimpleDeclarationAmbiguity.str,
	* src/disamb/disambiguate/SimpleDeclarationAmbiguity.meta,
	* src/disamb/disambiguate/InitDeclaratorAmbiguity.str,
	* src/disamb/disambiguate/InitDeclaratorAmbiguity.meta,
	* src/disamb/disambiguate/FunctionDefinitionAmbiguity.str,
	* src/disamb/disambiguate/FunctionDefinitionAmbiguity.meta,
	* src/disamb/disambiguate/ConstructorDefinition.str,
	* src/disamb/disambiguate/ConstructorDefinition.meta,
	* src/disamb/disambiguate/DeclaratorIdAmbiguity.str,
	* src/disamb/disambiguate/DeclaratorIdAmbiguity.meta: New.

	* test/disambiguate/Makefile.am: Update.

	* test/g++/template/Makefile.am, test/g++/overload/Makefile.am,
	* test/g++/other/Makefile.am, test/g++/opt/Makefile.am,
	* test/g++/init/Makefile.am, test/g++/inherit/Makefile.am,
	* test/g++/eh/Makefile.am, test/g++/debug/Makefile.am (XFAIL_TESTS):
	Update.

	* test/disambiguate/simple-decl-02.detcc,
	* test/disambiguate/simple-decl-02.cc,
	* test/disambiguate/simple-decl-01.detcc,
	* test/disambiguate/simple-decl-01.cc: New.