Closed #4: CommonJS shimming is automated. Also some c/r.