Drill-346 : constant expression code generation. Code refactoring.