A minor performance improvement is applied.