Slight clean up to new token spacing.