Loan improvements sans the integrated tracing feature

Everything from before, but I rolled-back integrated tracing support in all the affected files as per your request.