More xexpr work.