This fixes a looming namespace pollution problem, allowing things other
than the swig bindings to inhabit the package-specific namespace.
Original: efe5a2866a0b19b0c3abd348f3f5b789899a9b17