Expand some Location and LocationParameter fields
Unpick the previous change where I shortened the location param names.