Fix TODOs and indentation of code folds.