Don't wait for a listener if there's not one.  Just break.
Adjust line-numbers for 0-indexed expectations.
Make `lookup` requests more complete with references.