Accounting for comments by @njasm and @mnapoli on #20