Improve handling of item subtargets and subactions.