Address review issues:  Cosmetic tweaks, deepcopy some more constructor args.