Make it possible to use the new code motion through an option.