MADS: Resolve some old TODOs