Answered Francis' comments, thought about what these imply, and added corresponding TODOs.