Fixup after review by @s1monw