PR comments fixups.