[PATCH 0/4] Rework <tpm/> formatting