New TODOs thanks to dermoth (GitHub issue #10).