Some JSON schema cleanup