This reintroduces c0687e19 (Add support for `NOLINTBEGIN` ... `NOLINTEND` comments) but with fixes to the tests.