re #5 - Using the session-exit hook to kill riviera buffers, much cleaner.