Avoid short as arguments and results for numbering vars.