Fix Inspect and make the JSON less tied to the internal implementation.