Work towards moving to the constraining of what's in subscription.status #15