Tweaks per @afeld's comments in #14