Minor rearrangements of #1448 fix.