Convert more internals to "modern" Objective-C