Improvement of MSON AST (Review fixes)