[PATCH 1/3] refactoring of XCCDF shorthand expansion and namespace assignments