@NonNullByDefault adoption. Reorder null annotations after modifiers.