Merge "Improve readability of SpecialBlock::checkUnblockSelf"