Combine the two (unless window-system) sections.