Consistent handling of (de)initialization