Rename some variables; eliminate an unnecessary #pragma unroll