Cleaned up some ambiguous classes.