reviewed, all ok;

perhaps rephrase the line about #846 to make the unsuspecting newcomer get the message