Start moving jsmacros into core