Cosmetics.
Some more C++11 usage.
Add support for rule 11-0-1.