Remove helpers and keep auto vars in an array

What do you think?