Add changes to Form.pm from 3.0.6.