Revert to static classes in attempt to fix in IIS

Attempting to fix #421 and #439 . Can people running IIS 7.5+ please test this pull request and let me know if it fixes the problem? Many thanks!