Log Message:
Fix build by solving a namespace collision introduced by libnbcompat.
I'm doing it the easy way because jlam@ will look at this problem closely
in a future.