Macro switches in evp for 0.9.8e

#748 partay.