Reinstate setting addr_width to the result of the computation,
but in the conditional rather than at initialization time.