(cleanup) Less deep nesting.