b49b836f3a
These variables are now in separate scopes and thus do not need unique names. Signed-off-by: Mans Rullgard <mans@mansr.com>