Simplify regex patterns
Enable TrailingComment, WhitespaceAround (excepting zanata-war)