Fixed the ad-hockery of the ThingInfo types

Made all of these decently consistent.  Indeed, they're arguably now
somewhat redundant, but I'm keeping them separate, since they represent
distinct server types.