Post review edits

See PR conversation for details.