Minor cleanup from last change