Swift: tweaks to compile under B6