Some more progress on making the unifier nicely executable