[exim] acl_smtp_helo question

I've just created the acl_smtp_helo check and moved the checks that I
did in acl_smtp_rcpt into it. It has changed logging some but why does
the syntax helo check (for the _ ) not show in the same syntax?

acl_check_helo:

drop message    = Forged HELO: $sender_helo_name
  hosts          = !+relay_from_hosts
  condition      = ${lookup {$sender_helo_name} 
cdb{EXIM_DIR/cdb/forged_helos.cdb}{yes}{no}}
  log_message    = Forged HELO

drop message    = Forged HELO: $sender_helo_name
  hosts          = !+relay_from_hosts
  condition      = ${lookup {$sender_helo_name} 
cdb{EXIM_DIR/cdb/rcpthosts.cdb}{yes}{no}}
  log_message    = Forged HELO rcpthosts

accept

and my logs have changed from this:
2004-11-19 09:23:35 H=(64.72.68.25) [221.1.168.65] F=<SAFZHGT@???>
rejected RCPT <seong@???>: Forged HELO

to this:
2004-11-19 09:24:28 H=(64.72.68.25) [211.203.39.103] rejected EHLO or
HELO 64.72.68.25: Forged HELO
2004-11-19 09:44:26 H=(idsi.net) [24.60.154.103] rejected EHLO or HELO
idsi.net: Forged HELO rcpthosts

my questions are how can I make these:
2004-11-19 09:13:00 rejected HELO from [200.119.80.241]: syntactically
invalid argument(s): tnt_pool_11980-241.etb.net.co
2004-11-19 09:19:53 rejected HELO from [66.28.204.22]: syntactically
invalid argument(s): etang.com,sohu.com
2004-11-19 09:19:58 rejected HELO from [81.190.29.106]: syntactically
invalid argument(s): (no argument given)

show up in my acl_smtp_helo or are they already checked from there
already? But I don't see how since I never had this acl before..

Also second question is there any way to combine my acl_check_helo
conditions to be done in one check insted of two? I've not been able to
see if there is a 'or' statement for acl condtions..