Fix bug, not fully factoring all args
Get rid of expr.simplify and expr.factor methods

Pretty sure it's good enough to just use expr.simplify() and
expr.factor().

Also, changed normal form of ITE from s ? a : b to s ? d1 : d0
s/_simplified/simplified