change calls to 'setState' to functional style

This, and using 'Object.assign', make it easier to add pieces
to the state afterwards without having to change *all* invocations
of 'setState'.