Fix decode_cf_variable, without tests

same as #153, but without tests.