Fixed refactoring errors that caused some optimizer regressions. Also, simplified code a little.

git-svn-id: svn+ssh://svn.code.sf.net/p/firebird/code/firebird/trunk@59114 65644016-39b1-43b1-bf79-96bc8fe82c15