More astyle preparation for display3d.cpp, reducing the depth of some deeply nested scopes.
Remove unused cluster iteration code.