Minor cleanup for debug loading.