Simplify logic now that r182490 is in place.  No functional change intended.