Toby-
OK, I have some notes:
The pipe trick would work well in this case,
with [[#Y|]] being treated as [[#Y|Y]] --
Not sure we should really simplify this stuff (and probably not with
another overload of the pipe, that is going to get real messy), given that
we generally want to discourage it.
Regards,
Erik