Since we have performed a migration, the db should be in a consistent state, and we can remove the non-strict option.
We move the payment status to a new bucket hierarchy. Old buckets and fetch methods are kept around for migration purposes.