Shortcuts 0.5

Includes shorthand for targets, <st..> handling, and minor refinements
to the ambiguous case issues.