Address issues with nesting.