Fixed issue where toJSON was no longer overrideable, then flagellated myself for checking in code without running tests first.