Less duplication, at the cost of one more entry in the callstack
Avoid magic strings
Bring DNT up-to-date