Move a couple of TODOs down to a separate section of unlikelies