Small fixes.
More Swift, less ObjC.
: [