[PATCH 14/16] wsc: Refactor to separate DBus-specific code