Updated code.

This code is to make provision for the move of the debugging info to the
model blocks.