(maint) Remove tap idiom for creating arrays

Previously, this code was using .tap to create and return an array
in one step. I find this idiom slows down reading the code, so this
commit replaces it with a simpler idiom using a local variable.