Minimal changes to allow correlation_id to be used

Fixes #7 

Needs testing as I'm not sure whether mouse attributes can share their `clearer` function.