Add define highlighting, per issue #1