Still another TODO tweak.