fix up more Lisp_Object/int conversion issues