Merge pull request #2829 from jacquesg/dead-code Remove logically dead code (we're already asserting)