Change to using explicit "set" / "delete" commands.

  This is more flexible.