Review Performance Regression

Review a change on a hot path for extra allocations, repeated work and slow calls.

• review
• code