Tweaks as per @threebean's comments.