[blamestross]

I use a sacrificial USBC extension cable for this situation. It isn't cheap to replace, but it is easier than the USBC hub or power brick I have may laptop plugged into.