If you haven't already, can you please file issues on these TODOs so we don't lose them.