#97858Improve type annotations regarding storage folder names
Description
Storage folder names can also be int-like string, which causes them to be autoconverted to ints when used as array key. This recently has lead to a bug. We should make our code more explicit to help static code analysis and devs avoid this problem in the future.