Fix parser to work with I,Robot and other tree modifications