Simplify storage size handling

No functional changes.