Hi,
You don't have to manually deal with the boil expansion, this is only to make it easier to compare values when you do measurements in your batch, since you don't want to cool down the liquid before noting your pre-boil or post-boil volumes.
When it tells you to use 8.4L of water this is...