cell: fix breakage from xlib re-org