I agree about the expiry -- leave that to a separate bug.