I knew there was a reason we hadn't done this before. I'm going to try the Canon lives in a magical assembly approach, and that should clean this up. I wasn't particularly pleased by this part of my change, and how I kept finding new ways that it broke stuff.