several instances creeped back into the tree...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>