Previously, we accessed struct storage which is private to steverdores.

Thank you to Martin Blix Grydeland for pointing out this improvement
opportunity.