Partially fix cmd-line build for Xcode5.