de-arbify a bit more.

runs on radeonsi