A couple more TODOs relating to tables.