Further optimizations with r.js.