EXM-31161: Addressed several clarity issues that Mark noted.