Oxford comma.
Fixing upgrade transition semantics.  Closes #52.