WIP: cleanup d-bus calls somewhat.