PR tweaks, per @croxton