Fixed something I broke with the restructuring.
Removed TODO note for something that's now done.