Changes to accommodate the default ID type changing to string.

Paul verified these are the changes that he wants.