VE-1598: Minor cleanup