Yes, absolutely.  I'd like all the generic agents to use it (cf-serverd also has some related code IIRC) but wanted to keep this change as limited as possible while we're in beta.  Can you update https://cfengine.com/dev/issues/4650 with the plan so we can discuss the refactoring and cleanup there?