Swift: last bunch of tweaks to build successfully under Beta 3