Respond to reviewer comments

Most important of which is removing 'setup' lazy sequencing binding.

Also some re-ordering has moved some actions to the top level as they
are of general importance.