fix parsing of BuiltinFunction + expr