Change some interfaces that aren't really interfaces into classes.