Resolve "Instrumentation errors in ivas-float-update branch"

This MR fixes instrumentation issues in the ivas-float-update branch preventing the calculation of memory/complexity.

Closes #998 (closed)