Access these static members from the types they're actually declared on to avoid extra dereferencing.
Fixed more broken exceptions.