Refactor infinite comparable definition a bit