Remove unnecessary C99-isms