Fix #644: Broken source maps.
Fix our SourceMapper wrt 0-based and 1-based (again).
Merge pull request #649 from sjrd/fix-source-maps

Fix source maps and source mapper