SCHEMA-219. Addresses more comments.