Improve challenge expiration integration

[Firehed]

Take the enhancements from #73 and perform a broader integration into the challenge comparison processes in the protocol, rather than relying on the implementation to throw.