put back form_heading generalisation, lost in a merge somewhere