Obvious x86 64 compile errors, part 2

A few more test fixups, avoiding duplicate case values, and addressing a `static_assert`.