Final fixes to make collections work as lists

Hi,

the first patch 3b8cccc handles the Collection case in the upper layer of the code. I think it is pretty simple and minimal but you may want to rework it. I am open to suggestions. The patch is tested and it is in IWFM (it t works for me) status but it's not like I did extensive tests.

The second patch is a fix for nested else style warnings of eclipse. It brings no functional change.

Thanks