[CLC-2111] Spare extra object allocation

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-2111