VE-635: Minor cleanup