Catch more E713 and E714 with a regular expression; issue #236 continued