10565 bug

[Mwindo]

See #5613

[jimlerza]

Total personal preference and absolutely not necessary to change, but I like using shorthand where possible.

This:

return someArray.map(m => {
  return {
    foo: 'bar'
  };
});

can be shortened by wrapping the return object in parens:

return someArray.map(m => ({
  foo: 'bar'
}));