Performance improvements.

Also switch to using CIL type names not C#.