Infer nullity
Deduplicate
Rearrange entries
Infer nullity
Add missing @Overrides