Conditional ref update fixups

This tries to address @arrbee 's concerns about wording in #2042.