This will simplify the block size update in many places.

Change-Id: I255093692315d81340900baea6ccee0c02b9abd4