Fixed up address arithmetic.