Merge cases with upper block.
This is a cosmetic change only to simplify code.

Reported by: anish
Sponsored by: iXsystems Inc.