[PATCH v2 0/3] Rework <tpm/> formatting