Adds canonicalizing, does bigger nofolds problems.