More things will be moved into this in subsequent changes. While we're at it, we can also make use of std::array.