Use the key accessor instead of the instance variable.
Merge branch 'master' into better-handling-for-json-parse-errors