Correctly color "end" command, and variable name in for loop.
Expand the variable name as an ordinary parameter in for loops. Added
test for it too.