More hierarchy changes to Effect classes.