Mor code analysis fixes

@SLaks, please review especially the CA1063 commit (14532ce). I believe, I got that right. :)