fixed calculation of next features which involve more than one variable identifier
this fixes type errors in busbox file tar.pi for example
Merge remote-tracking branch 'origin/defusecleanup' into defusecleanup