VE-1613: Small optmization to variable initalization and assignment