Fix rule 16-3-1.
Add support for rule 16-3-2.