Copy the string based map opts over. This will allow setting the draggable cursor at the map level, etc.

It's pretty obviously flawed, but everything is up and running except association.

It doesn't really make much sense under D7 anyway, taxonomy doesn't associate with nodes the way it did before,
it's all field based now.

Fix locpick.

Definately not done but it's helping with testing other parts of the system.

Revert followup change for #337585 -- the only thing an empty macro should return is the autogenerated id.