Change 3 more commits to C style for C89 compat