Avoid tmp vars for #544 isssue in elseif conditions