Tidier header-flattening.