A bit more refactoring in forms to make them leaner.