If we need to keep the magic special treatment of init, then these three patches look like a good cleanup to me. Thanks, Roland --