Changes needed to make test cases pass under Xcode 6.1 beta 2.

Unfortunately the ability to extend a generic type was removed
in 6.1b2 due to outstanding bugs. When extending generic types
is possible again some of these changes will be reverted.

See https://twitter.com/practicalswift/status/513425033600204800