Code changes based on code review by David Turanski in PR #33 for JIRA issue SGF-203 concerning persistence.