Improve source locations.

Closes #64