More cleanup after WTForms 2.0