Clean up - debugging.

Minor changes for debugging types.