Revert to strict accessor and update specs to match, mimic emissions-gql approach more closely