New patch attached, assignemnts out of conditionals, updated comments
and types.


-- 
Niv Sardi