Fixes to EXPLAIN QUERY PLAN output. Change weights back to something closer

to what they are in legacy.  More test case fixes.

FossilOrigin-Name: 36373b85f9a97840aa06e24ae31c12fcfbae084e