A few more ideas to add to the TODO.