Fix an assumption that there is a single return value when verifying