More streamlining of general_ck and expr_ck