Modifications to make it easier to dump the internal model.