Changes to new helper syntax for #2