More changes to C-ify the old MACRO code.