Not sure why these aren't being detected on master right now - they should be...
Also fixes circular references when using IJsonSerializable.