Switched to using new simplification resolving system.
Switched to using new simplification resolving system.

jackfirth/herbie,jackfirth/herbie,jackfirth/herbie,jackfirth/herbie,jackfirth/herbie,jackfirth/herbie