issue #21684: organize todos