* matcher/lib_unparser.ml: further cleanup