Further simplification!  Ish.  Not thrilled with what I've done to Merit
and Flaw.