OE-3603 - saving consolidation class as intermediate commit,
-fixed parenthesis escaping
TODO- fix further escaping and consistency problems