Cleanup evoked generators

addresses Alexandre's desire to be rid of Evoked(None) calls.