Annother code cleanup. Support !join.