Minor cleanup per MT's comments