Same change as Revision r1395 for C++ port: Small speedup, per issue 422