more cleanups, variant initializers