simplify if-then-else nesting

git-svn-id: svn://svn.code.sf.net/p/fuego/code/trunk@1914 2e953b5c-c64d-0410-be54-f773e93e544c