(i) Make it slight more ovbious what's going on. (ii) Alleged 'doc' fix.