Checkpoint to fix memory leak before I forget.
Added arguments maps so parameters can be read by index.

[Delivers #55775856]
Self-review.