Import more fixes from cffi-grovel