Simplify sexp wrapping code
Add wrapping commands to ielm-map