Use a nameless splat argument for our black holes
Remove EtagBuster

Reverts 'f350c9b6273e97c7163892df8f93a129e7c83ca9'