I would support creating a ticket. Once aroundReceive is in place I'd be happy to make the proper modifications.