add quick exit for simplify if expr is Atom
3730: use as_content_primitive and cancel

* also change the general expand to only _mexpand when computing expr2
  in simplify