Porting expiry changes

WIP.

Added the new `isExpired` behavior and `expireNow`. Fixes a legitimate `RemoteExpiry` failure, and switches of some tests that we don't care about any more.

/cc @jish