Simplify and adapt to match 0.4 changes
Eve 0.4