Tidy-ups for Compound WID