Cleaned up a few of the smokeable item classes.