User blog comment:Catinthedark/Infobox level: killing the massive switches/@comment-4189499-20150705095805

Looks good! As long as it works, I'll temporarily lower the protection of Tenmplate:Infobox level so you can add the relevant parts.