Remove support for "will catch" and "will control", as per recent spec