Allow map keys to be function calls

The majority of changes in this diff is simple moving Arguments and
Argument above Function_Call in the source order.