remove some low-hanging namespace pollution.  needs more work