Fix remaining sexp constructors