[WIP] Support for standard source maps, cleanup