[PATCH] rewrite of initializer handling