Issue #29: Towards cleaner C code