* Fix some language conformance issues needed for GCC 4.0