Adjust Oliver's code to Gnus namespace. Add some