Address misc. PR comments by @cvrebert