#1728: #1727: performed edits identified by NJR, CC, THU

opened by thuchacz