Removing/fixing non-C89 code