Fix for #1925: bug with if expressions

Support else refinement in if expressions, like in if statements
Test for #1925: bug with if expressions
Updated test .src as result of #1925: bug with if expressions