FogBugz V8.5.XXXX Compatability

Also cleanup the code with resharper