Updated @todo comments. No behaviour change.