Cleanup; fixes compile on non-C99 compilers.