Make brand_object simpler and more robust, fix some streq()s