more infinite-proofing