small optimization: avoid popping the current block until we have to
1 file changed