Fix false positive E711/E712; issue #336
Fix false positive E713; issue #330
Merge branch fixing issues #330 and #336