Minor cleanups to keep token spacing right for crowded charters.