* Remove need for ident strings for storage items * Fixes * Fix tests * Minor change to macro grammer