OK,
This dump is a proper fix for the three bugs mentioned in the first email.It now just outputs an ALTER USER command for the cluster owner and hasnothing to do with the '-S' switch.
It also fixes the other two issues.
Chris