Fix some loop vars for objects. Fixes gh-409