#423736 by soxofaan: big refactoring in 6.x-2.x branch: use of hook_elements() instead of hook_form_alter() This is the basic work, follow-up patches with tweaking will follow