Re: [4/4] comctl32/rebar: Update Rebar structure