Replace none() by anonymous lambda
Tidy up DropDownList a bit
Remove unnecessary enumerate calls