Add TODO about null/zero-length-array equivalence.
Allow idle-time-out to be absent.
Merge heads