more cleanups; carp on wrong # of fates from nqp