Fix a type and jettison some more Berkeley references.