Ameliorated #468, maybe. At least, it doesn't erroneously show the name errors any more.