Substitute DiscretizationMethod by Tags.
See !2844 (merged) for a simple first draft, which is slightly different.