some cleanup in 4th-order tensor loops