Also fix a bug with wrong sizing for multiple forms. The last default size encountered was being used, rather than using the one that matched the default form.
