removing some nonstandard stuff so it compiles with other compilers.