Remove flatten, not being used any more
Attempt to enable escodegen comment generation