Edits according to comments. refs #395.