VE-456: Minor cleanup