Improve eat_until_matching_token(), so it does not eat too much, when encountering...