Removed completed TODO.
More flag cleanup. Blech.