Make complex component rendering more idiomatic and performant