Adding assert() to forms, required a bit of refactoring here and there

Adding assert() to forms, required a bit of refactoring here and there #2424