Fix TODOs in code

[dorthrithil]

There are a few TODO comments in the code that I seem to have forgotten in some past issue, mostly refactoring stuff.