More TODO cleanup
Support for std::array