Fix Xcode 5 -Wdocumentation warnings from mismatched parameter names/returns