Minor cleanup for merge