Issue #29: A bit more C cleanup