Remove more nesting.