Some minor cleaning up (as a result of Xcode 4.6 being better than Xcode 4.5).