Minor cleanup of some storage classes