Removed multiple workarounds as without them things work as expected
Chase HEAD - $form_state; Help hook update