@@ -10,9 +10,9 @@
 main(input, output, log, mode, suggestions, vars)
 	local doc = ct.parse(input.stream, input.src, mode)
 	input.stream:close()
 	if mode['parse:show-tree'] then
-		log:write(dump(doc))
+		log:write(ss.dump(doc))
 	end
 
 	-- the document has now had a chance to give its say; if it hasn't specified
 	-- any modes of its own, we now merge in the 'weak modes' (suggestions)
@@ -162,9 +162,9 @@
 				local nt = {}
 				for j = i+1, i+nargs do
 					table.insert(nt, arg[j])
 				end
-				print('onsw')
+				onswitch[longopt](table.unpack(nt))
 			elseif nargs == 1 then
 				onswitch[longopt](arg[i+1])
 			else
 				onswitch[longopt]()
@@ -203,10 +203,10 @@
 
 	return main(input, outp, log, mode, suggestions, vars)
 end
 
-local ok, e = pcall(entry_cli)
--- local ok, e = true, entry_cli()
+-- local ok, e = pcall(entry_cli)
+local ok, e = true, entry_cli()
 if not ok then
 	local str = 'translation failure'
 	if ss.exn.is(e) then
 		str = e.kind.desc