(spec) Event more factorisation (please squash with a878616 before merge)