Fixes #538 helpers aren't called is data passed to the template happens ...

...to share the same name as the helper.