Checkpoint while adding better logging of lookup failures
Added method imports.

[#59187878]
Self-review