Fixup after first round of @s1monw's review