macro switches in evp for 0.9.8e
Merge pull request #756 from reaperhulk/evp-macros

Macro switches in evp for 0.9.8e