Some more streamlining of architecture sections.