* src/disamb/disambiguate/SimpleTypeSpecifier.str,
	* src/disamb/disambiguate/PrimaryExpression.str:
	Remove unused debug code.

	* src/disamb/disambiguate/Lookup.str: Fix.

	* test/g++/other/Makefile.am, test/g++/opt/Makefile.am:
	Update XFAIL tests.