Updates based on @sethvargo's comments.