Bye bye C89, hello C99.
A bit of reworking.