VE-1467: Minor cleanup