Revert a conversion from an array to a list (to avoid the extra unnecessary allocations) and deal with a few code review nits.