Squashme: fixups from @bnoordhuis's review.