Refine Swift optionals usage per Beta 7.
Refine Swift usage with framework return types per Beta 7.
Refine Swift usage with framework return types per Beta 7...

Includes dealing with the nice little API change
surprises from UICollectionViewDataSource.

Sigh.