Add FailoverStyleDict, plus various improvements to StyleDict

Fold it into its only caller.