Fix issues with Beta 6

Update: This *could* just work.

I'm not suggesting to merge these changes as is (includes silencing a compiler error in maxpow4h/swiftz#98), but here's how I got `swift-development` to compile on Xcode 6 beta 6, if it helps anybody.
Why are these changes necessary? Do nested functions not work anymore?