Compile-failure with latest 21.2 cvs