Removed C99 features and fixed 2 wrong assertions.