Simplify nesting. #857