VE-1558 Condense variable assignment