Start transitioning to better bytecode rewriting