Z3 fully modularized, except splitting heuristics