More D-Bus cleanup.