Further cleanups, esp. re source maps & macros.