Merge "re visit a block of commented-out lines of code"