Tidy up some side-effects of issue #93