More concise map inspect
Include source in mapping stringfy
Only show offset if its not zero
Use filename of other when adding
Merge branch 'master' into additive-identity