fixup! Add Comparable trait to js.rs; fixups