tidy up the constructor
Adjust instrumentation to only work via the RSVP namespace

This should satisfy @domenics OCD.
be slightly less paranoid