Resumed refactoring forms, hopefully without breaking reports this time.