[arch-general] [PATCH 31/48] Simplify test to see if we should assemble arrays at startup