Clean: remove a couple TODOs Was worried about a bug, but deeper scrutiny think the code is correct Tests: none, trivial change