command type enum in ast.h adapted so that unmarshalling should now work with all junctions