Tweaked macro definitions.