More lifting.
Better coverage.
More lift and fixed bug in fun parsing.