Take stars out of types where they make more sense.