More StringTokenizer cleanup.