This will simplify the setup, and streamline SPIRE configuration. I'll close other SPIRE/SPIFFE-related issues accordingly.