These were made redundant in r325841.
Just make sure it builds with the default clang and I'll pull this into Mellanox later on. Looks good.
MFC after: 1 week
And send me the MFC e-mail when you receive it!