Update loci and locitest for match canonicalization.

Reviewer: trivial

Loxigen output from commit c47bc6fa.