Namespacing fixes for bug 1028358, r=CLOSED TREE