macaroon: simplify check return value

The multiple return value did not really help anything;
also make a slightly better first party caveat test