I made a lot of changes in the sourcemaps-wip branch to enable a far smaller subset of directives necessary (and I wanted to do more, but chose to minimize diffs). A few of them are inline overrides on legacy code, because the patterns they allow I would not want to promote in the codebase.