Reuse size variables, add missing var.