Get rid of unnecessary Expression overrides
Consolidate duplicate satisfy_count implementations