Migrate more helpers to ES6 format.