Fix desugaring not being applied in multi-file analysis.
Try to add origin informating in desugaring.
Fix incorrect match in NaBL definition for entity.