Fix last remaining specs for new sexp construction