BF - improved parsing of rules that have comma.