Added TODOs for this in 49dce0e.