Adding a TODO for 'the big macro-expand'