[kdbus][wip] Code cleanup