Here's a tidied version of the reference loop fix. There's actually only one non-comment line of code changed. As you can guess from the NEWS patch, I'm planning a point release to include this bugfix. I'd also like to include the mset fix [1], so it would be great if someone could test that. [1]: id:20180406114307.7067-1-david at tethera.net