Fixes to error sanitizer.  Catch a lot more errors that can be simplified.