Refactor to use bare enthought libs instead of scoped.