These must be handled the same way as https://github.com/cfengine/core/commit/ef3b5fe24263f47db8ef937f450cd3655c1b59b4, I presume?