Formatting and fix for iOS < 4 crash added recently.