Fix storage const autoload

Superseeds #9587

cc @icewind1991 @PVince81 @schiesbn @th3fallen @DeepDiver1975 @speijnik

It makes the "-2" below more reasonable. I would keep it. It doesn't hurt, as it is just a comment