BlockLevelPass: further fixes for T218817