Clarify naming of location parameters.
Ensure location params are always cloned.