Address all the TODOs in the code

[desilinguist]

There's a bunch of suggestions that Mike left in the code that are tagged with TODO in the comments. We should try and see whether we want to address those.