Added orfn2 and andfn2

Use apply instead of funcall so that multiple arguments can be used.

Altered items:
orfn2, andfn2