Move to modern Objective C.
Fiddling and changes.