remove misleading and unnecessary underscores
don't expand subexprs of for loop, just re-expand whole thing.