Structurally sound... (Update fixup code to use structural comparisons for binary and other structural key types)

Only small code changes and additional testing.