Deleting these made it much more of a hassle to do migration work on PM, so I ended up abandoning it.
It would be preferable if, as an intermediary step, the values were brought back as deprecated, so that the core code can be modernized without being forced to completely get rid of value dependencies at the same time.