Safer, simpler.  #2820.