Improved handling of initializers