This TODO needs to be TODONE, because this is a confusing function. Ditto all the other TODOs.