Migrated more helpers to ES6 preferred format