Add a few missing cases from r199933. Testcase coming shortly.