Fix tidy exceptions for reorg.