Stop a warning from g++ 4.3, but add a 'todo' note that the code needs checking....