Improve key handling. no_cdable_vars