Fixed canonicalization bugs with passersby and corgis (#14 and #15).