Handle comments in define properly
2 files changed