A small tweak to simplify the code for bug #7409.