Checkpoint attempt to make proper nesting work.