callable and func_ptr typedef fixes