Change slightly confusing local field name.

Adopt naming from ATExecDropNotNull() for same type of data.
Use meaningful alias names in refresh_by_match_merge().

Per gripe from Andres Freund.  No substantive changes.