Bit more work on C++ scan