Various fixes to location expression logic.