Updates per @jacobian's feedback.