Minor updates to class definitions.