Don't use Mozilla-only function closures, use arrow functions in this case