Correct. I made a few attempts, but not any real headway on the issue.  I undid what I had, but swapped those lines by accident.  The only thing of note in this pull request is the failing test, which highlights the issue of using discriminator maps with simple refs.