Improve source locations.

@strager, please give me your test case in which multi-locals were failing.

Closes #64