Compile Failure in Latest CVS Sources for 21.2