The commit 6483813b was missing changes necessitated by 2abfc75 that causes a crash. Also, use ARRAYSIZE() for cleaner code. Follow-up to 6483813b Ref #14055
6483813b
2abfc75