Restoring dump of multiuser databases

All of my non-superusers are restricted from creating databases.
Whenever I upgrade Postgres, I have to hand-edit my dump and change:

CREATE USER usr1 WITH SYSID 101 PASSWORD '...' NOCREATEDB NOCREATEUSER;

into:

CREATE USER usr1 WITH SYSID 101 PASSWORD '...' CREATEDB NOCREATEUSER;

and then after the restore, I do a:

UPDATE pg_shadow SET usecreatedb=false WHERE usesysid <> 1;

Is there an easier way? Or would it make more sense if pg_dumpall
generates this:

\connect template1 postgres
CREATE DATABASE db1 WITH TEMPLATE=template0 ENCODING = 'SQL_ASCII';
UPDATE pg_database SET datdba=101 WHERE datnam='db1';
\connect db1 usr1
...
CREATE TABLE ( ... );

instead of this:

\connect template1 usr1
CREATE DATABASE db1 WITH TEMPLATE=template0 ENCODING = 'SQL_ASCII';
\connect db1 usr1
...
CREATE TABLE ( ... );

That is, the superuser creates the database for the normal user, and
then set the owner to the normal user. This way, the normal user doesn't
have to create the database himself.

--
dave