* lib/cxx/TemplateParametersOverlays.str,
	* lib/cxx/TemplateDeclarationsOverlays.str,
	* lib/cxx/SpecifiersOverlays.str,
	* lib/cxx/SimpleTypeSpecifiersOverlays.str,
	* lib/cxx/NamespacesOverlays.str,
	* lib/cxx/MemberSpecificationsOverlays.str,
	* lib/cxx/IdExpressionsOverlays.str,
	* lib/cxx/DeclarationsOverlays.str,
	* lib/cxx/CompoundStatementsOverlays.str,
	* lib/cxx/ClassSpecifiersOverlays.str,
	* lib/cxx/BaseSpecifiersOverlays.str,
	* lib/cxx/Makefile.am,
	* lib/prelude/Overlays.str,
	* lib/prelude/Layouts.str: Delete.
	* lib/prelude/Makefile.am,
	* lib/Makefile.am: Update.

	* test/disambiguate/test.test: Disambiguate once only.

	* test/disambiguate/enum-04.detcc: Fix.

	* src/disamb/disambiguate/TemplateArguments.str,
	* src/disamb/disambiguate/VariableDefinitionCandidate.str,
	* src/disamb/disambiguate/VariableDefinition.str,
	* src/disamb/disambiguate/VariableDeclaratorCandidate.str,
	* src/disamb/disambiguate/VariableDeclarator.str,
	* src/disamb/disambiguate/TypeDefinitionCandidate.str,
	* src/disamb/disambiguate/TypeDefinition.str,
	* src/disamb/disambiguate/TypeDeclaratorCandidate.str,
	* src/disamb/disambiguate/TypeDeclarator.str,
	* src/disamb/disambiguate/TypeAmbiguityCandidate.str,
	* src/disamb/disambiguate/TypeAmbiguity.str,
	* src/disamb/disambiguate/TemplateTraverseCandidate.str,
	* src/disamb/disambiguate/TemplateTraverse.str,
	* src/disamb/disambiguate/TemplateDefinitionCandidate.str,
	* src/disamb/disambiguate/TemplateDefinition.str,
	* src/disamb/disambiguate/TemplateClassTraverse.str,
	* src/disamb/disambiguate/TemplateClassDefinitionCandidate.str,
	* src/disamb/disambiguate/TemplateClassDefinition.str,
	* src/disamb/disambiguate/SimpleTypeSpecifierCandidate.str,
	* src/disamb/disambiguate/SimpleTypeSpecifier.str,
	* src/disamb/disambiguate/ResolveCompound.str,
	* src/disamb/disambiguate/Resolve.str,
	* src/disamb/disambiguate/PrimaryExpressionCandidate.str,
	* src/disamb/disambiguate/PrimaryExpression.str,
	* src/disamb/disambiguate/Parameter.str,
	* src/disamb/disambiguate/NestedNameSpecifier.str,
	* src/disamb/disambiguate/NamespaceTraverse.str,
	* src/disamb/disambiguate/NamespaceDefinitionCandidate.str,
	* src/disamb/disambiguate/NamespaceDefinition.str,
	* src/disamb/disambiguate/Makefile.am
	* src/disamb/disambiguate/afcxx-disambiguate.str,
	* src/disamb/disambiguate/LocalOrGlobal.str,
	* src/disamb/disambiguate/IfDebug.str,
	* src/disamb/disambiguate/Definition.str,
	* src/disamb/disambiguate/CompoundStatementCandidate.str,
	* src/disamb/disambiguate/CompoundStatement.str,
	* src/disamb/disambiguate/ClassTraverse.str,
	* src/disamb/disambiguate/ClassOrNamespaceTraverse.str,
	* src/disamb/disambiguate/ClassOrNamespaceAmbiguityCandidate.str,
	* src/disamb/disambiguate/ClassDefinitionCandidate.str,
	* src/disamb/disambiguate/ClassDefinition.str,
	* src/disamb/disambiguate/CheckTypeName.str,
	* src/disamb/disambiguate/CheckNamespaceName.str,
	* src/disamb/disambiguate/CheckClassName.str,
	* src/disamb/disambiguate/CheckEnumName.str,
	* src/disamb/disambiguate/BaseTraverseCandidate.str,
	* src/disamb/disambiguate/BaseTraverse.str,
	* src/disamb/disambiguate/Ambiguity.str: Rewrite with concrete syntax.

	* src/disamb/bitfield/afcxx-bitfield.str: Fix.

	* src/disamb/disambiguate/VariableDefinitionCandidate.meta,
	* src/disamb/disambiguate/VariableDefinition.meta,
	* src/disamb/disambiguate/VariableDeclaratorCandidate.meta,
	* src/disamb/disambiguate/VariableDeclarator.meta,
	* src/disamb/disambiguate/TypeDefinitionCandidate.meta,
	* src/disamb/disambiguate/TypeDefinition.meta,
	* src/disamb/disambiguate/TypeDeclaratorCandidate.meta,
	* src/disamb/disambiguate/TypeDeclarator.meta,
	* src/disamb/disambiguate/TypeAmbiguityCandidate.meta,
	* src/disamb/disambiguate/TemplateTraverseCandidate.meta,
	* src/disamb/disambiguate/TemplateTraverse.meta,
	* src/disamb/disambiguate/TemplateDefinitionCandidate.meta,
	* src/disamb/disambiguate/TemplateDefinition.meta,
	* src/disamb/disambiguate/TemplateClassTraverse.meta,
	* src/disamb/disambiguate/TemplateClassDefinitionCandidate.meta,
	* src/disamb/disambiguate/TemplateClassDefinition.meta,
	* src/disamb/disambiguate/TemplateArguments.meta,
	* src/disamb/disambiguate/SimpleTypeSpecifierCandidate.meta,
	* src/disamb/disambiguate/SimpleTypeSpecifier.meta,
	* src/disamb/disambiguate/PrimaryExpressionCandidate.meta,
	* src/disamb/disambiguate/PrimaryExpression.meta,
	* src/disamb/disambiguate/Parameter.meta,
	* src/disamb/disambiguate/NestedNameSpecifier.meta,
	* src/disamb/disambiguate/NamespaceTraverse.meta,
	* src/disamb/disambiguate/NamespaceDefinitionCandidate.meta,
	* src/disamb/disambiguate/NamespaceDefinition.meta,
	* src/disamb/disambiguate/LocalOrGlobal.meta,
	* src/disamb/disambiguate/EnumDefinitionCandidate.meta,
	* src/disamb/disambiguate/EnumDefinition.meta,
	* src/disamb/disambiguate/CompoundStatementCandidate.meta,
	* src/disamb/disambiguate/CompoundStatement.meta,
	* src/disamb/disambiguate/ClassTraverse.meta,
	* src/disamb/disambiguate/ClassOrNamespaceTraverse.meta,
	* src/disamb/disambiguate/ClassOrNamespaceAmbiguityCandidate.meta,
	* src/disamb/disambiguate/ClassDefinitionCandidate.meta,
	* src/disamb/disambiguate/ClassDefinition.meta,
	* src/disamb/disambiguate/CheckTypeName.meta,
	* src/disamb/disambiguate/CheckNamespaceName.meta,
	* src/disamb/disambiguate/CheckEnumName.meta,
	* src/disamb/disambiguate/CheckClassName.meta,
	* src/disamb/disambiguate/BaseTraverseCandidate.meta,
	* src/disamb/disambiguate/BaseTraverse.meta: New.

	* src/disamb/disambiguate/EnumDefinitionCandidate.str,
	* src/disamb/disambiguate/EnumDefinition.str: New.