added try expression autotemplate; regenerated parser after grammar change; modified tests so that they work with new grammar;
cleanup