More work on REST-less events