More work on bug #8369.  Just a few optimizations.