Remove the INCR macro in order to stick as much as possible with Fortran, so that the code is not too much obfuscated.