Object shorthand properties; small fixes to ES6 function parameters.