A few more static, const & size_t fixes.