Improve rules to detect more block expressions and multi catch. Crete specific rules for control statements for easier handling