Reduce duplication in the Storage fields management

Handle filtering the hidden fields from the docs in a separate function
to reduce duplication within the storage class.