Changes needed for cl2000 compiler to work.

Please do not merge this -- it is defective.