o Make upnp_append_variable() not return any result.
o Simplify call-sites of upnp_append_variable() (and get rid
  of a lot of goto's there).