Fix #1553 "XBL: With lhha, option to associate @for with internal control"

Also add support to existing XBL components where it makes sense.