feat: Constrain with slot number

[LHerskind]

Since #7594 can quite easily be unmanagable in size if it is both dealing with plumbing and constraining + updating the tests I think it will be useful for us to deal with the constraining based on the slot number separately.

[LHerskind]

This was fixed as part of #7758