a few more things changed so other compilers can deal with it as well.