Optimize planning a bit more.