Removed C99 feature, adapt to Firm coding conventions.