BR 2413265: don't pessimize displacements