Re-enable some additional things related to Evil.