Update to catch up with Swift 2.2 with Swift Policy

Plus minor cosmetic changes