Update under Andy Wingo's suggestion.