Towards C89 compliance