Remove unneeded uses of else{} in api/

Fixed a little documentation issue, removed a line of unreachable code
and fixed up two formatting issues in the process.

Change-Id: If29391ee1a0daf19973437f36c3216b8716debd0
Merge "Remove unneeded uses of else{} in api/"