Rebase of Pull Request #645: Small fixes from Chicago and MIT (updated)

Rebase of #645 onto post-schema-simplification main. See that pull request for more discussion.  Also see #695 for discussion related to the rebase.