Possible fix for first error in #1287 I couldn't repro, but it's possible some serialization was happening during a hotload to cause this.