add if_kind to check it is 'if' or 'unless'
more gentle separators
allow ';' in if statement to separate statements in it