Issue #2160117 by sun: Remove/convert remaining calls to variable_get/_set/_del().