[#1814] Mark - Move code into form_section_page

Also split a step in two rather than using a regex to combine two things
that just made it harder to follow.
[#1814] Mark - Move code into form_section_page
[#1814] Mark - Move code into form_section_page
[#1814] Mark - Rename for consistency

form_section -> section_name as I find this clearer.
[#1814] Mark - Remove unused code from steps
[#1814] Mark - Remove @wip scenarios

Scenarios seem to no longer be relevant.
[#1814] Mark - Unparameterize step

Since it is only called in one place.