Fix up a couple more @TODOs.