WIP: Eliminate indirect import errors.
WIP: Eliminate indirect import errors.
Added line number output to diagnostic messages.
WIP: Eliminate indirect import errors.