The storage class logic looks like it needs some love; let me see if I can clean this up.