Simplify the macro. Delete TODOs.