Fix for Xcode6.1 (Swift 1.1) & improve Optional handling.