Don't give typedefs (without VM-type) symbols

This fixes a segfault trying to cleanup a non-VM typedef on scope exit
Factor out store & store_mask_store == typedef