Extra check doesn't seem to have much effect on performance. This may become a bigger concern if other bottlenecks would go away.

Fixes #2568