Precise a comment
Wrap a long line
Rework the assertions:
    Do it in the right order
    Do not put str*cmp-that-could-be-a-ugly-glibc-macro in assert()