Based on your feedback yesterday. There's also a pull request on ari/stdbus. This code is not that well tested yet, but seems promising so far.
This change is