Simplified code
Simplification
Cleanup
Fixed Scanner to not process blocks related to if-construct as blocks
Fixed comparison to native types
Ignore direct blocks inside blocks
Cleanup
Moved block cleanup into flattening engine
Updated resolver code to use new logic for processing if-else-blocks