Issue #29: Progress towards better C code