Removed unnecessary arrow_nil() calls

Also fixed a bug @ line 424: bodyVal -> elseVal