Improved <<choice>> arguments

<<choice>> can now accept arguments phrased using the link syntax, e.g:
<<choice [[a trapdoor?|falling]]>>. This saves the trouble of having to
account for its inconsistent argument order.