Added some TODO notes for cond-expand