much better, though wasteful implementation breaks a few tests, but ploughing on first
remove unnecessary Virtual namespace prefix which was a large motivation for the move
and associated changes in code, requires tests etc