[Concept] [PATCH 06/29] buildman: Rename variables that shadow builtins