Some further refactoring in form classes.