Ah yes, I hadn't considered the map upgrade routines.  It relies on having access to the raw yaml values, which already causes trouble -- it doesn't have access to the raw actor placement yaml, which prevents it from being able to operate on placed actors.

The best fix may be to add a public Yaml property that exposes the raw map definition, and then let the upgrader extract the weapon/rules/actor nodes itself.