Finally got around to updating one of my test carts to 4.0.19, and speed is significantly slower, even after removing the new option code as noted above. Don't have the time to deal with finding the cause, but 4.0.18 works fine, so I'm sticking with it
