Merge recent dbus changes better.