@ebryn I completely agree, a single source of truth makes so much more sense.  It appeared as if this was happening before, and I implemented it for backward compatibility, but maybe I was imagining things.  I'll gladly rip it out.