Renamed variables to avoid conflicts when Makefile removes internal closures.