Addendum to r29847: actually remove the old OPAL_VAR_SCOPE_POP

Refs #3694