Edits according to feedback, refs #369.