Avoid an overly long line by moving a comment around, and remove a use
of else-after-return.
Signed-off-by: NThierry Reding <thierry.reding@gmail.com>