Tighten JSON schema

Comments in the commit messages.