Fixes #563
Fixes #152
Somehow addresses #145 by preserving the original sources in the inSourceMap (if they are there)