Fixes problem where redundent single element list around tokens