Remove some redundancy.
Add support for rule 2-13-3.