dbus: remove evil intractable macro, fix memory leak