Fixup per Stef's review.