Fixes for Xcode 5 code completion issue.