Sourcemap combination and better map granularity

Resolves #79.