Fix variable shadowing bug in requirement expansion

Long term we should probably rename the installer's "f" attribute to
"formula".