Specify a few more types
Remove old TODO