JRH: Knock off a few more TODOs