[PATCH 30/32] storage: eliminate unnecessary labels