Update help text. See #1034 and #817.