Slightly tweak builder output format